Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/gtkutil.c
index 897eade85032f25e0ecab3a517af4becd8fd7b15,ba506faf356f91dee2cce0831c76e10761662fd3..81033b2b12bff7262345b9e4e5d49f91f5adf9df
--- 1/src/gtkutil.c
--- 2/src/gtkutil.c
+++ b/src/gtkutil.c
@@@ -1183,16 -1037,8 +1191,10 @@@ xg_frame_set_char_size (struct frame *f
        /* Must call this to flush out events */
        (void)gtk_events_pending ();
        gdk_flush ();
 +#ifndef HAVE_PGTK
        x_wait_for_event (f, ConfigureNotify);
 +#endif
  
-       if (CONSP (frame_size_history))
-       frame_size_history_extra
-         (f, build_string ("xg_frame_set_char_size, visible"),
-          FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
-          f->new_width, f->new_height);
- 
        if (!NILP (fullscreen))
        /* Try to restore fullscreen state.  */
        {